From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Wed, 2 Aug 2006 14:47:04 +0000 (+0100)
Subject: [HVM][SVM] Fix PIO breakage (fixed for VMX in previous changeset).
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15754^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=d3beb92d96734715589448332335757eead5cfea;p=xen.git

[HVM][SVM] Fix PIO breakage (fixed for VMX in previous changeset).
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 01d48b2524..bb16553f55 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1484,7 +1484,7 @@ static void svm_io_instruction(struct vcpu *v)
                     count = (addr & ~PAGE_MASK) / size;
             }
             else    
-                vmcb->rip = vmcb->exitinfo2;
+                regs->eip = vmcb->exitinfo2;
 
             send_pio_req(regs, port, count, size, addr, dir, 1);
         }
@@ -1495,7 +1495,7 @@ static void svm_io_instruction(struct vcpu *v)
          * On SVM, the RIP of the intruction following the IN/OUT is saved in
          * ExitInfo2
          */
-        vmcb->rip = vmcb->exitinfo2;
+        regs->eip = vmcb->exitinfo2;
 
         if (port == 0xe9 && dir == IOREQ_WRITE && size == 1) 
             hvm_print_line(v, regs->eax); /* guest debug output */